stupid hacks and tweaks to speed up tests