Fixed focused tests for hydra-core