refactoring specs to reflect gem structure