Add some more simple tests