Fixed issues with rspec warnings (see comment in rb:1-2 of spec_helper)