Move this to the test package