Some further rework on Test-First chapter... this is a long one, have patience :-)