Code Review

* Removed windows line endings (^M).
* Removed module include of test file in module file.
* Applied coding standards.
Merge pull request #1 from nigelgbanks/7.x-code-review

Code Review