[Katie & Jo] Refine testing setup