Update tests according to chapter six exercises