Update specs to use rspec 3 syntax

- [ ] Review and merge after #19