Tweaks to event routes, first complete event test (passing), changed route names