Fix UT - make it not fail