add some more tests and uncomment the scan until call