Tests
Strategy fixes