more tests, less code
clean up vector building