[#59]: Update DAO & Service layer; mute test cases