Merge "Remove Whitebox tests"