adjusted test cases to new behavior of DISABLE_XYZ options