Reverted back to the original testcode