Rearranged test cases, etc.
Minor changes