Adding fixes for failures due to modifications of automation framework