Using a map test (instead of events)