Added Vector table and tests
Small edits to main
Fixed merge conflict