more fixes, tests still failed