added CustomUserEvent Test and adjustments