add domain methods + unit test
Unit test correction
update