Re-organize the testcases and other miscellenous work