added zippy tests and more utility functions