Added zipper partial evaluation test. Some code refactored (made more suitable for testing)