Refactor tests, entry update function