Issue #2946425 by vaplas, borisson_, Lendude, dawehner: Correcting the tests that lie in BTB but using WTB