Fix testing (partially), them make it work for PAM2.0