Some more tweaks to test pipeline