Adding tests for #546 - will have to update xslt next