Fixed several specs which either had deprecation errors or poorly written tests. TRAD-33