Fixes NetService/Identifier config for tests
Removes Iconv
Dirty fix for variable indicator measures in charts