API complete. Tests remaining