Refactored to use goconvey