cleanup test issues