Improve integration tests

Includes #65