cleaned up most of the test issues