Added additional component mocking to try to resolve flickering tests