Moved self-dependence test to a place where it will actually be useful