cleaning up tests, starting to add sample data/schemas