more blend, some test tweaks