Removed gevent, added tests