New test suite, fixed tests.