Reverted back to working test code