add user and goal relation, correct tests