Added more schema tests and made amendments to schema class
More tests and minor fixes to schema/model