Broke pairing in last commit...fixed and tests are passing