Updated and fixed the test suite, ready for CI server. TRAD-12 #time 3h Finished specs