fix up of tests in progress...