fix tests and add comment for the change