Adding integration test based on #8535