rspec tests
rspec tests
Merge branch 'specs'