Update/cleanup integration tests