Close GH-426: Mock tests with zip, closes #424..