Add a couple of simple tests, fix test of variable type.
Merge pull request #6 from colomon/master

All tests pass!