fix up some of the testing related stuff