Moving tests around to match the organization in n4023