1) fix merge issue for the image async testing
2) allow client side and server side test cases have different results
Merge pull request #2 from charlescao/master

1) fix merge issue for the image async testing