Reverted back to original test setup