Added Entity class for tests