Fixed unit tests for Bug 971090