refactoring specs and continuing solving failing test after syntax change