Switch test
Switch to new more evented system; add eventless-bind function