minor tweaks, some test changes