Fixes unit test issues introduced by after FALCON-107 after merging with origin/master.