API updates + testing