Refactored solutions spec