improved a lot of coverage on tests (domain)