[PATCH 2/2] Remove TESTING_SUPPLE