Fixed all unit tests for issue #2112