Added fix for defaulting NHS number

It was incorrectly doing the logic against the location
Ignoring of tests

Ignoring incomplete tests