Small tweaks to test job