Modify ObjectMother for new file and data structure