Updated ExtractTest to new Api