Fix GA events, hopefully last test