Refactor - still a couple of failing spec