Hacking up tests for 1.4