NEMO-545 slight modifications to fix unit tests