Reorganized integration tests for buggy situations