Changes for rspec for #1. Not done yet.