Merge pull request #3 from lynnaloo/unit-tests

Unit tests
Merge remote-tracking branch 'XTUPLE/master' into unit-tests