Consistency improvements and tests for Vector 2, 3 & 4