pair programming tests and fixes