Bug 876623 - Add some tests for bug 867045