Merge "Add more debug logging to a test" into feature/gearman