Reordered test cases a bit to match test plan