All tests passing with new strategies