Add most test cases