1. Add the some extra log information for debugging
2. Re-order the test cases so that the execution can go more smoothly
Merge from Perforce