Updated apiary API and tests