inclusive scan, cleaned up tests