Bug 16976 - Unit tests