fix tests
move cleanup
fix
non blocking scan