Modify to user toEqual()
Modify to more accurate tests
Add Utility tests
Merge branch 'develop'