Fix most of the remaining test brekage