remove todo, increase test coverage
consume latest 3.0.x snapshot at 88c8c33f8