various test tweaks