Updated indicator unit tests