Added 6 more integration tests