Tested APIs and committing fixes