More tests, updated comment styles

and more reorganization