fix for test issues