Fixed bug 876852 - Fixed unit tests