More changes for scan corrections and unit test coverage

Issue-ID: RIC-673

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I337e8caebda4d4585fbce2ab455caaa4f68be8f1
15 files changed