Old test restored and workaround added for builderCI script.