I think maybe we can do a test clean up and switch a lot of things in one go?