Vector overhaul, several more complete test cases.