Restructure vector.go to match test order