Moving tests to the apporpriate classes (were previously all lumped under DFATest