contribution test fix
code cleanup
fix comment (cherry picked from commit 7d4a826)
code clean up, typo