fix TestClass name, make module level variable all capital and other code cleanup
#2252
| Job | Run time |
|---|---|
| 2m 3s | |
| 2m 8s | |
| 48s | |
| 51s | |
| 2m 33s | |
| 3m 40s | |
| 12m 3s |