Unit tests modified to integrate with VS