Everything: Unit tests. Rename Api class to Client since that makes more sense.