More testing.

Added tests for Schemas. Dicovered some issues with models in the process. Corrected. All tests written pass at this time.