changed listings of events to match the order they are dispatched
removed useless code from a test form