Issue #162 - Removing mock string