various code test tweaks