rename test
renames + tweaks