Improve integration specs