Re-added testcases