refactoring tests and seeding