Cleanup + get rid of some RSpec deprecation warnings