Few more tweaks to try to get tests working.