Update test scripts with new Layers