make all Api Listener tests pass