Fix VS unit tests