Updated test methods