Fixes to Advisor/Basic Strategy, Testing