Refactored specs, added new gem