Build fixed for lack of iconClassFormat option
Added two more todos for test coverage