[test] Cleaning up tests