moved some more simple tests