Brought fixed testcase over from previous apnic master