Updated test cases and desc