Clean up event accesses and tests