Fix various integration tests

Worth a brief comment that this is for JBoss6 compatibility.