1) fix merge issue for the image async testing

2) allow client side and server side test cases have different results