Fixed up simple tests