Fixed Edgecase input and expanded testbed