Gowri : fixed few @wip tests