Updated test scripts
Updated test scripts with detected type
Fix for failed test