added comments
Got test generation fixed and first end-to-end test passing, yay\!
rename for clarity