Fixed server usage for validation messages and expectations in tests