[UPDATE] Update code to resolve unit tests
[UPDATE] Update code to resolve unit tests

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