Updated tests for shorter tests for each assertion and updated data files