Fix test suite and add more tests.