Fixing test script to use new type tags