Should these be moved to the rest of the TR tests?