Reverting back to the small test API.