Temporarily disabling a test to get the merge done