Rspec 3 syntax

This will conflict with #88 with #6b09132c2ac1ba5767c083c9d08617a39693805b.