Get rid of test hacks