Merge pull request #1041 from rustyswayne/Refactor/M-502

Touch ups on ported model factories