Merge branch 'fix/update-test-configuration' into align/align-idgen-random