* fix warnings and errors in test compiles with BUILD_SHARED_LIBS * did requested changes and added one change to allow all tests to succeed in windows DLL (cherry picked from commit 79f11dbaa7)
79f11dbaa7
(cherry picked from commit a5d0adf395)
a5d0adf395
(cherry picked from commit 1a23f9c274)
1a23f9c274