C-FIORDEV-22 test pass4sure