minor tweaks from tests