Merge "Add tests for disabled actions in ActionTest"