complete fixing tests from jeffrey code review.