minor cleanup in test code