collision event and test fixes