Upgrade Ruby version
Eliminate deprecation notices in stubbing syntax
Explicitly enable should cause I don't currently have time to redo everything