Change approach to testing early return