CXF-5543 Made tests more solid