Merge updated schema & tests

[skyreflectedinmirrors]

Fixes a bunch of annoying issues with the way I had the schemas set up, and allows specification of model overrides