WIP action-set tests tweaks