fixed test suite issues