Changed to metamodels base unit tests