Fixed a bug w/ Event tests, mostly done w/ Script tests