Mahendra | #580 | Adding more tests