improve test coverage
version 2.0.0-rc.2