improve integration tests