extracted uploadable behaviour from entities to abstract class, added UploadableInterface
fixed test