Moving tests to new files