Re-add tests.