all new tests pass, need to fix regressions