renamed test
misc tweaks