Minor rake & rspec related fixes