 Fix tests in master branch
Fix tests in master branch