move test generator into class
move towards using class more
move class further away from main logic in file
break up long line
remove commented lines
unsupress errors
add whitespace
drop commented out code
add missing import; how did this ever work?
put spaces around operators