Merge "Give a size for image so test doesn't have to wait for the load." into jb-dev