fixed test regressions