added entity and tests