changed to rspec
change to rspec

rspec alows better bdd

Merge branch 'feature-change_to_rspec' into development