Some additional cleanup for tests.
Fixes for a few tests.
Fixes for constants defined in csproj.