Fixing spec tests.