Feature/migrate to rspec3 #4