Fixing API tests.

Only two failures, two errors remain.