more tweaks
make test work again