another test case and minor cleanup