Added some additional tests. Found a hard test case to converge....