Move test setup to a generic name
Modified disabled support and tests
More collection tests