reformat, test
namespaced events and some tests