Some fixes to SubIconTest