Fixes to Advisor/Basic Strategy, Beginning of Testing.