Consolidate and re-organize testcases