Fix the tests.
Mock the Factory in the tests.
Merge remote-tracking branch 'origin/token-override' into orocrm