Fix and more tests.