Modify test methods