Merge pull request #234 from bmeurant/master

some work on tests