two test plan fixes and an arm build fix