SD-320 Fix tests.