Fixed bug in test suite. TRAD-35