added many tests, fixed missing macro in xUnzipKeys