Updated indicator tests
Merge origin/master
Updated indicator tests