Improve FI-WARE tests
Improve integration tests