cleaning up, getting going with next set of tests