updated Cores and tests