More test failures fixed. Down to 3 in core.