Modified vector types
Converted tests to XCTest