Updates to API and testing