Re-write of password policy functional tests part 2
Re-write of password policy functional tests part 1