rework after issues with rspec 3