Bunch of fixes. Rspec3 scopes, steps.