Merging with latest master, adding a test, and adding setup to the job config