Added value handler event tests and divided others to avoid collisions.