Testing-related changes