Merge "Update tox to correctly use OS_TEST_PATH"