Cleaned up event tests a bit