Simplify test bootstrap
Add text merge fields to image merge, too
Fix dependencies