pass current tests, create model factories
Merge remote-tracking branch 'origin/develop' into feature/oscar-store-integration