Test fixes with Xcode 6.1
Add `layerWithOverlayImage` function for drawing images on images