address comment, add tests