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

Sync's the unit test module.