Update tests to reflect correct ordering of cases