Update test cases and remove injection test from this PR