fix some rspec deprecation warnings
fix ordering deprecation warning