Refactoring
Better imageForEntity tests