Radically simplify platform testing and fix driftfile for EL7