Fix comments, restructure test a bit.