test refactor on core