Hopefully, fix some tests.