Some Test factories tweaks