[WFLY-2218] Some more fixes to get tests inline with what has been done in the eap branch