fix all tests except ApiListener