Update tests to RSpec 3
Merge branch 'pr/3'