Added/fixed tests.