add annotated entity and test
modify test logic