Hopefully fix remaining failed tests.
Updates based on PR comments.