Rewrote integration tests