enhancements in strategies and tests, plus bug fixes