retabbed JeevesModel and associated tests