index merge suggestion: added tests + fix from prev commit
Making sure that we can return NaN properly
Minor