Add unit tests to N2VC refactor