Chris's and Marcus's tests pass