Fixed a few issues with tests
Merge pull request #64 from alanquillin/FixingIssuesWithSomeTests

Fixed a few issues with tests