tweaks to multi context testing