minor cleanup in tests