ZL: added new tests