Latest test cases run fine now.