Hackety hack, tests now pass again, but action_list() hasn't been reimplemented