Fix deprecation warnings
Fix last of the broken RSpecs