Fix oneeventmode

I branched off the addTesting branch, which is why there's multiple commits. Merging that one first will clean up this diff