Add solution and tests for zip