Remove dependency on InvalidComponentException from test support layer