Fix bug where nin was not saved from feide

Was removed by mistake at some time in the past. Introduced a few tests to ensure that things work as expected.

Resolves: GREG-223