Refactor, HSpec integration