Almost finished ZIV check and test