Get tests + indicator calculations working