Added/fixed tests