removing event machine; simplifying test runner