Add back some simple tests