Do a better job of reseting env vars in specs
Fix logic error reset_app_sandbox spec device selection