[DF-None] Unittest small fixes.