long running task to refactor core tests
long running task to refactor core tests