Change tests to newplanner