Add unit tests for TestNonEntityDao