Testing cleanups