Closes #348 - Clean up ScannerConfiguration and create unit test

Pull request for #348