Revised test cases and cleaned up for final submit.