Hopefully fixed tests.