Added new tests and fixed HRZ