Fixed issue #6
Improved the tests