Cleans up and expands on unit tests for issue 3396.
Cleans up and expands on unit tests for issue 3396.

AndreyZM/Bridge,bridgedotnet/Bridge,AndreyZM/Bridge,AndreyZM/Bridge,bridgedotnet/Bridge,bridgedotnet/Bridge,AndreyZM/Bridge,bridgedotnet/Bridge