Finish cleaning up Action tests