Change layout of job protocol a bit and add a test