Schema update, standardization, test updates

All the things