Merge pull request #1921 from lambday/develop

rename bootstrap in test statistic framework
rename TestStatistic with HypothesisTest and pulled two methods to base