xml: More tests for convert_and_merge script.

 * Full test which should include most features at once.
 * Fixing pack-pattern tests.
 * Update composable tests.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
18 files changed