DEVIDM-58 - minor fixes to tests