more fix for unittest