Code review fixes

* New RSpec expectation syntax
* Fixed wrong instance variable name