[FOLLOWUP][CLEANUP] Wrap the tests bootstrap code into classes