Event-admin test should be fixed now, and did a little cleanup.