Fix and cleanup for internal Si tracker test case