more test hacks.