Add simple tests for new functionality