re-added domain unit tests