fixed a few failing tests
image merging issue on production server fixed