computer refactor plus tests