SNAPSHOT: Add more extensive integration tests