Fix cyclomatic complexity of VasConnectorType
Start of tests for MotownCentralSystemService 1.5