basic changes to core tests, working now.