Fixed TestClass image handling
Added Entity type