Last fixes with removing pet actions from unit tests