Added norm options and a real merge to combined tests.
Added norm options and a real merge to combined tests.

basnijholt/holoviews,ioam/holoviews,basnijholt/holoviews,ioam/holoviews,ioam/holoviews,basnijholt/holoviews