Removed use of deprecated ResourceUtil.isA(..) with resource.isResourceType(..).
Fixed tests