Move png to common test files dir, fix descriptor tests.