CON-286 | Fast unit tests fixes after CR