Add basic unit testing. re #96
Small modif
Fusion