Some more Appium spec cleanup.