mahendra | #191 | added more tests to ensure 100% coverage