+ fixed test failures