1. Added more dao-layer test cases.
2. Rename domain entity.