For when you are back Sofia, I've commited the changes left over from my previous review for you, leaving you with just the last couple of nf-test fixes

Looking into this today.