Fix test, fix entity validator for objects, implement image class