WIP #22, more tests; fixes in example models; more decoupling in OneTimePasswordBehavior