More cleanup and speed up tests