Starte cleaning up the test suite. TRAD-38 TRAD-32 #time 1h Cleaning up specs