Fixed regression bugs in the test suite. TRAD-46 #time 20m