hotfix for wrong classname
hotfix for wrong aliases
better master password tests