Refactored spec to get rid of extra block variables