DEVIDM-54 - Mainly fixes for tests