Refactor beanstalk specs
Tweak gitlab specs