Jh clean up tests