#121: Includes key +password tested again