addressed reviewr feedback
update tests