Fixed some deprecations in the spec suite