more fix for uni tests