Add rspec for testing
Merge branch 'rspec'