Change provider test cases to have easier to search for references