Reinstating airbrake test, removing hoptoad test (still valid??)