Fixed scaladsl2 test and review comments