fixed tests broken by new abstract class 'indicator'
Merge remote-tracking branch 'upstream/master'