Tweaked vector-wrapper and test script.