Fix specs after last merge
Change RSpec syntax to be RSpec 3 compatible