Improve code coverage

[anirbanbasu]

Code coverage should be improved with more exhaustive tests, including end-to-end ones.