Reimplement more tests.