More cleanup, though status_forcelist tests are still borken?