CON-605 | Fix remaining unittests