Updated gems
Refactored specs