more testing tweaks