update for feedback, update tests