updated tests, added temporary fix for
https://issues.jboss.org/browse/JBWS-3736