Moving tests where they should be