Merge "Update testing build configuration to be compatible with new changes"