aligned password
bad merge fix
moved initialization to after class
Merge pull request #1237 from LorenzoBoccaccia/fix-all-the-tests

Changed to non static initialization to align with base constructor