Adding nan behavior, renaming  to
Updating tests to include nan case and update name