added SchemaService / refactored tests