Refactor clearance tests to use user factory
Merge remote-tracking branch 'origin/master'