more commenting and formatting of tests