fix(test): resolve 18 make-test regressions from the marathon batch

fix(test): resolve 18 make-test regressions from the marathon batch #58