Fixing up more merge issues around different versions of nUnit