LDN-1755: adding more tests