synch testing branch with recent changes

2 jobs for testing
in 19 seconds, using 0 compute credits, and was queued for 3 seconds