Removed unnecessary conditional branch, fixed test and comment.