Updated provided code again so that updated tests pass...