Fix hardcoded tests bugs