Migrate to modern testing interface