OSNG-63 OSNG-64 - fixed tests after merging