Broke up vendor tests into two parts