Further additions to backtest methods

Small changes to flow within method but nothing major. Still needs
auditing