Updated tests for entries