code review, test cleanup