Added brightness and surface options to EventPerSecond test