[WFLY-2229] Some fixes due to fails of unit tests