test case fixing almost done...