Incorporated Rohan's test cases