lots of work on Test case refactoring.