added more tests, refactored vector files