Fix test errors
Merge branch 'master' into dev