changed TestData to EntityCreator and edited Base_Data Test
Merge branch 'master' of github.com:gathcon/Group3Project