cleanup + fixing fails tests