Add/Fix tests for better test coverage.
Merge pull request #51 from SuperJugy/addTests

Add/Fix tests for better test coverage.