Updated with the python testcases