Reverted back a testing modification