Added lots of changes to overall schema, making test data that agrees with project goals