ARQGRA-445: more unit tests added