Fix vector removal
Location function
Location testing