Add & fix Dao, Manager, Test class

Signed-off-by: Shabri Nur <shabri.nur.ilmi@gmail.com>