Fixed the failing tests
Merge pull request #13 from rickcarlino/master

Fixed the failing tests