fixed special case of lastname, firstname, suffix
Fixed tests