Changed wi-XX to wf-XX prefix...repaired tests