While here, also update pertinent unit tests to use the same vector identfication scheme. Suggested by: [at]joakim-hove and [at]atgeirr.
While here, also update pertinent unit tests to use the same vector identfication scheme. Suggested by: [at]joakim-hove and [at]atgeirr.