Clean up event logging
Fixed client tests