Refactored specs to match modules