Further moving around of tests