Updated schema. Added test data