PSR-2 fixes, extra coverage for Password