Rearranged tests for better grouping