Merge "Add more test case and some clean up"