Improve actions and action tests