fixing test regressions WIP