Clean up most rspec deprecation warnings

Too much noise when running api and core build

Fixes #3376