More changes for scan corrections and unit test coverage