Tests for ISPN-3770 + JBQA-8357

See: https://issues.jboss.org/browse/ISPN-3770
See: https://issues.jboss.org/browse/JBQA-8357