DP-127 Fixed order dependency in tests