minor cleanup and test update