Changed methods to use Uri object instead of bitmapimage. Makes testing possible.