Refactor integration tests to be more understandable