working copy, fixing 2 tests in core.