fix TestClass name, make module level variable all capital and other code cleanup

fix TestClass name, make module level variable all capital and other code cleanup #2368