Re-write tests.