Added indicator, modified indicators and modified strategies
Removed Test errors