Fixed bugs in the current test suite ready for new tests. TRAD-32 TRAD-37 TRAD-38