FALCON-728 Unit test failures on jenkins. Contributed by Sowmya Ramesh