more temporary test hacks.