Adjust Picture entity to EntityBase
Added test suit for all tests