Fixed test expectations and behavior