Fix for netty shuffle, unit tests and review comments