Sandesh, simij | #196 | Improved test coverage