Gowri: modified few tests to make build pass