Updated Strategy Tests
Refactored Classes