Unify test-mkN and test-mkV