Scanner complete - need acceptance tests
Added acceptance test
Merge branch 'feature/EnableService' into develop