Remove obsolete test hacks