resolve some test issues