Added more simple tests.