Some tweak to wmm test