Original code & tests made wrong assumptions here & below.