Split tests into public and private. Updated zip
Fixing tests?