organizes spec requires, removes factory wank

also corrects awkward logic in forgotten password spec.