Hopefully fixed tests for real.