fixes to tests and new helper method for tests generating valid event_hash