fix TestClass name, make module level variable all capital and other code cleanup
#2092
| Job | Run time |
|---|---|
| 1m 58s | |
| 2m 4s | |
| 46s | |
| 41s | |
| 2m 54s | |
| 3m 5s | |
| 11m 28s |