Reordered some tests