More cleanup from test reshuffling