..F....... [ZBXNEXT-1782] minor code corrections and a couple of new test cases