Add tests for ModelFabric and move other Model tests to correct package