Improved testing, removed gevent dependency