FALCON-127 Fix test issues after FALCON-107. Contributed by Shwetha GS