Reduce test image size
Merge branch 'new-api' into new-api-documentation