Fixes to ensure tests clean everything up and never collide with real data