two test plan fixes and ARM build fixes