OSNG-7: some fixes in system-test.