Merge "Remove quota whitebox tests"