During refactor to MainApp, scanner was set to no wcdma version

Fix this to use the full scanner.
Also removed a lint warning in ServiceTest. Should really try clean all the lint warnings up