Temporarily removing tests, will bring it back without the broad stub