one last round of arc fixes for test cases and other files