Streamlining get_entry_data, adding tests