Add comprehensive entity test-cases