Test infrastructure + maintenance cleanup