Working on issue #11. 
Some improvement of tests.