Fixing schema. Adding test data