minor tweaks and another testlevel