Rejig contexts so passwordEncoder is in test and in app context