Improves testing

o Also improves the extraction schemes for api