Move new tests to correct package