Add some codes for debug
Complete Test class
Commit at once