Repair unit tests, again.
Add headers to vs projects