[2.1.2?] Add missing sub-tests for strategy, fix error message typo.