Bug 843711 - Fix up new |Components| culprits in test suite. r=mccr8