Some basic ZZ tests and a bug fix.