Fixed bugs in test suite. TRAD-22 #time 10m Fixing spec bugs