Resolve TMS-2810 "Test fixes part 3"

This splits the prepare script up (reduced code duplication :) ) , updates some packages and fixes some tests + adds remaining tests to skip