Added/fixed test cases