Merge pull request #176 from francoisfonteyn/Make-test

Allow "make test"
Merge pull request #177 from francoisfonteyn/Make-test

New tests passing/adapted