Tech Debt: Combined the test helpers and test-loader