Moving tests to their own files