Rounding out API and tests