Cleaning rspec warnings

@dblock this is the branch i'm working on