Revert "Fixes to Advisor/Basic Strategy, Beginning of Testing."

This reverts commit c8bc5fe8d002a687c025640586a828d354f6a874.