tests - fix
Merge branch 'tests_fix' into scan