Exercise Six and udpdated previous Fitnesse tests