[#26]: Test data fix
[#24]: Update domain data