fixed test issues