remove unnecessary patches from xapi tests
error messages on tests and some simplifications