merge
fixed cmAuth.test