Fixes #245 Test failures in test_basic_scan_*