Refactor bitbucket specs to use newer rspec syntax