Fix the test cases to avoid hard-coded ids