Bug 1055908 - Add missing unit-tests for bug 1035117