Moving tests to single files