D-16424 Added functional test