Add more manual test cases