Misc refactoring - still one test failing testPasscodeChange for the passcode -> no passcode cases