wip
Tests
Strategy fixes