Mihir | #653 | Adding tests to cover all scenarios