tests passing
Test is unit test again.
Merge pull request #5 from willtp87/7.x

7.x