Fix test
Improve test coverage