Trying to fix test suite. TRAD-12