Fixed regression bugs in test suite. TRAD-48