Tried to fix unittest errors...no difference