OWB-763 next round of test fixes


git-svn-id: https://svn.apache.org/repos/asf/openwebbeans/trunk@1562309 13f79535-47bb-0310-9956-ffa450edef68