#277 Updated integration test
#290 MetaModel refactoring
#277 Updated integration test
#277 Refactoring, updated integration test