Reintroduce Netty3 provider, fix tests