NAS-2384 Yet another attemt to fix tests..