Make tests use core type standard, and be type independant
Remove references to 'esri' type indicators