OS-2339 cleanup unit test