Tests edited to cover new scenario.