Testing core refactor.