[#181][WIP] updated test accordingly
[#181][WIP] updated UML accordingly