Move tests to correct set