Updated to latest hspec version, added comments