diff --git a/app/tests/Fixture/ApiUsersFixture.php b/app/tests/Fixture/ApiUsersFixture.php
new file mode 100644
index 000000000..97cd3df57
--- /dev/null
+++ b/app/tests/Fixture/ApiUsersFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match API Users Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class ApiUsersFixture extends TestFixture {
+  public $import = ['table' => 'api_users'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/AttributeGroupsFixture.php b/app/tests/Fixture/AttributeGroupsFixture.php
new file mode 100644
index 000000000..07e3f5e18
--- /dev/null
+++ b/app/tests/Fixture/AttributeGroupsFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Attribute Groups Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class AttributeGroupsFixture extends TestFixture {
+  public $import = ['table' => 'attribute_groups'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/AttributesFixture.php b/app/tests/Fixture/AttributesFixture.php
new file mode 100644
index 000000000..819f8f56f
--- /dev/null
+++ b/app/tests/Fixture/AttributesFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Attributes Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class AttributesFixture extends TestFixture {
+  public $import = ['table' => 'attributes'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/MatchgridsFixture.php b/app/tests/Fixture/MatchgridsFixture.php
new file mode 100644
index 000000000..9f4ce55bc
--- /dev/null
+++ b/app/tests/Fixture/MatchgridsFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Matchgrids Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class MatchgridsFixture extends TestFixture {
+  public $import = ['table' => 'matchgrids', 'records' => true];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/MetaFixture.php b/app/tests/Fixture/MetaFixture.php
new file mode 100644
index 000000000..5f2a848ff
--- /dev/null
+++ b/app/tests/Fixture/MetaFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Meta Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class MetaFixture extends TestFixture {
+  public $import = ['table' => 'meta'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/PermissionsFixture.php b/app/tests/Fixture/PermissionsFixture.php
new file mode 100644
index 000000000..456d2de4c
--- /dev/null
+++ b/app/tests/Fixture/PermissionsFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Permissions Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class PermissionsFixture extends TestFixture {
+  public $import = ['table' => 'permissions'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/RuleAttributesFixture.php b/app/tests/Fixture/RuleAttributesFixture.php
new file mode 100644
index 000000000..c05f20b2a
--- /dev/null
+++ b/app/tests/Fixture/RuleAttributesFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Rule Attributes Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class RuleAttributesFixture extends TestFixture {
+  public $import = ['table' => 'rule_attributes'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/RulesFixture.php b/app/tests/Fixture/RulesFixture.php
new file mode 100644
index 000000000..9838dd5d6
--- /dev/null
+++ b/app/tests/Fixture/RulesFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Rules Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class RulesFixture extends TestFixture {
+  public $import = ['table' => 'rules'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/SystemsOfRecordFixture.php b/app/tests/Fixture/SystemsOfRecordFixture.php
new file mode 100644
index 000000000..da14d802c
--- /dev/null
+++ b/app/tests/Fixture/SystemsOfRecordFixture.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * COmanage Match Systems of Record Fixture
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+namespace App\Test\Fixture;
+
+use Cake\TestSuite\Fixture\TestFixture;
+
+class SystemsOfRecordFixture extends TestFixture {
+  public $import = ['table' => 'systems_of_record'];
+}
\ No newline at end of file
diff --git a/app/tests/Fixture/empty b/app/tests/Fixture/empty
deleted file mode 100644
index e69de29bb..000000000