Commented out ELP tests (revert next year)
Added Indicator Count test