fixing tests, one more shot...