DAR-153 small tests code improvements