Add a couple of simple tests, fix test of variable type.