Hopefully last removal of pet actions in unit tests