Support custom tags and cleaned up test case.