Add more tests
Merge pull request #18 from r-gaia-cs/tests

Add minor tests