Rework test to support 1.6.