Re-named several of the cupcake objects to distinguish them from the traits to help make sure that I haven't left any direct references in other traits.
Added tests for ImageService.findData. In the process we have refactored LocalSource to not be directly dependent on java.io.File