Fixing test failures
Merge branch 'master' of https://github.com/wso2-dev/product-greg