Take out both vector tests and change test to < 1800