Reorder some methods in the adapter classes.
Swat rspec deprecation warnings