[master] Unit tests simplify