This commit revives some previously disabled tests and converts some usage of @Disabled to @EnabledForTestGroups(...).