Updated Specs to cover more scenarios