improve integration testing