Added final (hopefully) schema changes and test data entry