fix test regressions. should run all tests before committing :-)