NYC3 test fix

Fix tests for new NYC3 region. Also improve the image tests/