Sort of make new test pass
Add comments; make test actually pass