Update specs to use new Rspec syntax
Merge branch 'feature/use_new_rpec_syntax' into develop