Bug 890326 - Update Unit Tests